bitkeeper revision 1.1159.92.1 (41545d59Fxft7m0sKTtY19hpC5vj4A)

Leave the TSC cpu feature bit set.

diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/cpu/common.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/cpu/common.c
index 07ced337a2201f802dec963338995a0eba030ee0..83b293dcd5d5bf21c37c86cd6ffffd953819f012 100644 (file)
--- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/cpu/common.c
+++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/cpu/common.c
@@ -534,7 +534,7 @@ void __init cpu_init (void)
        }
        printk(KERN_INFO "Initializing CPU#%d\n", cpu);
 
-       if (cpu_has_vme || cpu_has_tsc || cpu_has_de)
+       if (cpu_has_vme || cpu_has_de)
                clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
        if (tsc_disable && cpu_has_tsc) {
                printk(KERN_NOTICE "Disabling TSC...\n");

diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/Makefile b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/Makefile
index 6f7931e6da6747897cee6c7089a453fe84ebc100..f85f7de156842638ea62f01272437ac40e367f6e 100644 (file)
--- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/Makefile
+++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/timers/Makefile
@@ -5,7 +5,7 @@
 XENARCH        := $(subst ",,$(CONFIG_XENARCH))
 
 obj-y :=       timer_tsc.o
-c-obj-y :=     timer.o common.o timer_none.o timer_pit.o
+c-obj-y :=     timer.o timer_none.o timer_pit.o
 
 c-link :=
 

diff --git a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h
index 68889ad8322f2948ae343244d7022a983e38dd34..86c3d7c2ad76af1ebe2c5d27b84360522ed33306 100644 (file)
--- a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h
+++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h
@@ -27,7 +27,6 @@ void __init machine_specific_modify_cpu_capabilities(struct cpuinfo_x86 *c)
        clear_bit(X86_FEATURE_VME, c->x86_capability);
        clear_bit(X86_FEATURE_DE, c->x86_capability);
        clear_bit(X86_FEATURE_PSE, c->x86_capability);
-       clear_bit(X86_FEATURE_TSC, c->x86_capability);
        clear_bit(X86_FEATURE_PGE, c->x86_capability);
        clear_bit(X86_FEATURE_MTRR, c->x86_capability);
        clear_bit(X86_FEATURE_FXSR, c->x86_capability);